Patch from George Liebl to install all the headers in the right place.

Thu Jul  6 11:27:44 2000  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/Makefile.am: Patch from George Liebl to
	install all the headers in the right place.

diff --git a/ChangeLog b/ChangeLog
index bb0993992fab06119c3f777c70ed1cacc9822fca..9c5b011467f9e03e64e0ada03841d5c9e530ca74 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul  6 11:27:44 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/Makefile.am: Patch from George Liebl to 
+       install all the headers in the right place.
+
 Tue Jul  4 13:13:01 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Add remaining sections. Completes

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index bb0993992fab06119c3f777c70ed1cacc9822fca..9c5b011467f9e03e64e0ada03841d5c9e530ca74 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Thu Jul  6 11:27:44 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/Makefile.am: Patch from George Liebl to 
+       install all the headers in the right place.
+
 Tue Jul  4 13:13:01 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Add remaining sections. Completes

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bb0993992fab06119c3f777c70ed1cacc9822fca..9c5b011467f9e03e64e0ada03841d5c9e530ca74 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Jul  6 11:27:44 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/Makefile.am: Patch from George Liebl to 
+       install all the headers in the right place.
+
 Tue Jul  4 13:13:01 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Add remaining sections. Completes

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index bb0993992fab06119c3f777c70ed1cacc9822fca..9c5b011467f9e03e64e0ada03841d5c9e530ca74 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu Jul  6 11:27:44 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/Makefile.am: Patch from George Liebl to 
+       install all the headers in the right place.
+
 Tue Jul  4 13:13:01 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Add remaining sections. Completes

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bb0993992fab06119c3f777c70ed1cacc9822fca..9c5b011467f9e03e64e0ada03841d5c9e530ca74 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Jul  6 11:27:44 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/Makefile.am: Patch from George Liebl to 
+       install all the headers in the right place.
+
 Tue Jul  4 13:13:01 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Add remaining sections. Completes

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bb0993992fab06119c3f777c70ed1cacc9822fca..9c5b011467f9e03e64e0ada03841d5c9e530ca74 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Jul  6 11:27:44 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/Makefile.am: Patch from George Liebl to 
+       install all the headers in the right place.
+
 Tue Jul  4 13:13:01 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Add remaining sections. Completes

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bb0993992fab06119c3f777c70ed1cacc9822fca..9c5b011467f9e03e64e0ada03841d5c9e530ca74 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Jul  6 11:27:44 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/Makefile.am: Patch from George Liebl to 
+       install all the headers in the right place.
+
 Tue Jul  4 13:13:01 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Add remaining sections. Completes

diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index c77e82bb08a59bdff158a324423cfd59ab61afe9..7e3f0903848495e4f661826e2c07b47aedd2e3ce 100644 (file)
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 libgdkincludedir = $(includedir)/gdk
+libgdkx11includedir = $(includedir)/gdk/x11
 
 INCLUDES = @STRIP_BEGIN@       \
        -DG_LOG_DOMAIN=\"Gdk\"  \
@@ -73,14 +74,13 @@ libgdk_x11_la_SOURCES =     \
 libgdkinclude_HEADERS =        \
        gdkx.h
 
+libgdkx11include_HEADERS =     \
+       gdkdrawable-x11.h       \
+       gdkwindow-x11.h         \
+       gdkpixmap-x11.h
+
 EXTRA_PROGRAMS = gxid
 bin_PROGRAMS = @xinput_progs@
 
 gxid_SOURCES = gxid.c
 gxid_LDADD = $(LDADDS)
-
-install-data-local:
-       $(mkinstalldirs) $(includedir)/gdk
-       $(INSTALL_DATA) $(srcdir)/gdkx.h $(includedir)/gdk
-       $(mkinstalldirs) $(includedir)/gdk/x11
-       $(INSTALL_DATA) $(srcdir)/gdkprivate-x11.h $(includedir)/gdk/x11